]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
st/icon-theme: Use regular idle source over gdk_threads
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 1 Feb 2023 15:59:38 +0000 (16:59 +0100)
committerMarge Bot <marge-bot@gnome.org>
Thu, 2 Feb 2023 20:45:06 +0000 (20:45 +0000)
The shell code isn't threaded, so there's no reason for pulling
in Gdk's thread support.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2620>

src/st/st-icon-theme.c

index 396522aae86377abcb1328c6dd95680a74df67e7..f0f0b8ecbb51f9ed6bdbf7a3b2cf30bf0bad4ad1 100644 (file)
@@ -45,7 +45,6 @@
 #include "deprecated/gtkiconfactory.h"
 #include "st-icon-cache.h"
 #include "gtkintl.h"
-#include "gtkmain.h"
 #include "deprecated/gtknumerableiconprivate.h"
 #include "gtkstylecontextprivate.h"
 
@@ -195,7 +194,7 @@ struct _GtkIconThemePrivate
   glong last_stat_time;
   GList *dir_mtimes;
 
-  gulong theme_changed_idle;
+  guint theme_changed_idle;
 };
 
 typedef struct {
@@ -792,9 +791,7 @@ queue_theme_changed (GtkIconTheme *icon_theme)
 
   if (!priv->theme_changed_idle)
     {
-      priv->theme_changed_idle =
-        gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE - 2,
-                                   theme_changed_idle, icon_theme, NULL);
+      priv->theme_changed_idle = g_idle_add (theme_changed_idle, icon_theme);
       g_source_set_name_by_id (priv->theme_changed_idle, "[gtk+] theme_changed_idle");
     }
 }
@@ -847,8 +844,7 @@ gtk_icon_theme_finalize (GObject *object)
   g_hash_table_destroy (priv->info_cache);
   g_assert (priv->info_cache_lru == NULL);
 
-  if (priv->theme_changed_idle)
-    g_source_remove (priv->theme_changed_idle);
+  g_clear_handle_id (&priv->theme_changed_idle, g_source_remove);
 
   unset_screen (icon_theme);